Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes trash carts not working with fultons #5664

Merged
merged 1 commit into from
Feb 10, 2024

Conversation

SabreML
Copy link
Member

@SabreML SabreML commented Feb 4, 2024

About the pull request

Fixes #5621, which was caused by a runtime in /obj/structure/dropship_equipment/fulton_system/proc/automate_interact().
The cart's entry in possible_fultons has a key of "�\u{16}trash cart", but the fulton_choice passed from the UI is just "trash cart". Because they don't match, fult is unable to be set, and an error is thrown on L1154.

/obj/structure/dropship_equipment/fulton_system/proc/automate_interact(mob/user, fulton_choice)
if(!can_fulton(user))
return
var/list/possible_fultons = get_targets()
var/obj/item/stack/fulton/fult = possible_fultons[fulton_choice]
if(!fulton_choice)
return
if(!ship_base) //system was uninstalled midway
return
if(is_ground_level(fult.z)) //in case the fulton popped during our input()

Explain why it's good for the game

Bugfix!

Testing Photographs and Procedure

Screenshots & Videos

Before:
Runtime error. (I can't be bothered to go through the set up again just to record this)

After:

dreamseeker_CtCdInkfxp.mp4

Changelog

🆑
fix: Fixed trash carts not being pick-uppable by the dropship's fulton recovery system.
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Feb 4, 2024
@BeagleGaming1
Copy link
Contributor

Tested locally, seems to work but the trash cart layers under the attachment
image
(trash cart layer = 2.98, fulton attachment layer = 3.04)

@SabreML
Copy link
Member Author

SabreML commented Feb 5, 2024

Yeah I noticed that too. As far as I can tell it's probably been an issue for a few years.
/obj/structure/dropship_equipment blame:
image
/obj/structure/closet blame:
image

It's a bit late for me now, but I can try looking into a fix tomorrow? One of them probably just needs to be moved to a different plane.

@Drulikar Drulikar marked this pull request as draft February 6, 2024 01:01
@SabreML
Copy link
Member Author

SabreML commented Feb 6, 2024

Done! I've put it in a second PR rather than this one just in case. (#5673)

@SabreML SabreML marked this pull request as ready for review February 6, 2024 13:29
@Birdtalon Birdtalon added this pull request to the merge queue Feb 9, 2024
Merged via the queue into cmss13-devs:master with commit 9103818 Feb 10, 2024
29 checks passed
cm13-github added a commit that referenced this pull request Feb 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

You can fulton trash carts, but the fulton recovery system cannot pick it up
4 participants